Merge branch 'master' into scratch/correct-warning-pos

author Alan Mackenzie <acm@muc.de>

Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)

committer Alan Mackenzie <acm@muc.de>

Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)
author Alan Mackenzie <acm@muc.de>
Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)
committer Alan Mackenzie <acm@muc.de>
Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)
diff --cc doc/lispref/elisp.texi
Simple merge
diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge
diff --cc lisp/emacs-lisp/comp.el
Simple merge
diff --cc lisp/keymap.el
Simple merge
diff --cc src/keyboard.c
Simple merge
author	Alan Mackenzie <acm@muc.de>
	Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)
committer	Alan Mackenzie <acm@muc.de>
	Sat, 22 Jan 2022 11:02:50 +0000 (11:02 +0000)
		1	2
doc/lispref/elisp.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/bytecomp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/comp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/keymap.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history